bitkeeper revision 1.7.1.7 (3df0b21aFrBUXjYnKdTMgt_D5mJJbg)

conflict resolutions

diff --cc .rootkeys
Simple merge

diff --cc BitKeeper/etc/logging_ok
index 24128f27c5244c151155159e65a1cd6041b2d727,0abf014401d2298445162957a405f5cce66b1e22..f55bd8cab9ebf38f71cc2ebddde17435c3039740
--- 1/BitKeeper/etc/logging_ok
--- 2/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@@ -1,5 -1,3 +1,6 @@@
  akw27@boulderdash.cl.cam.ac.uk
+ akw27@labyrinth.cl.cam.ac.uk
 +kaf24@labyrinth.cl.cam.ac.uk
 +kaf24@plym.cl.cam.ac.uk
 +kaf24@striker.cl.cam.ac.uk
  smh22@boulderdash.cl.cam.ac.uk

diff --cc xen-2.4.16/common/domain.c
index 30b9209cccc439e7a7d41c02262e484680740319,7dc00d062d895f56834b8f546ff1b94fc00f94d4..962ac5f38b6300a5da53e51fbe7b7cec57b859dc
--- 1/xen-2.4.16/common/domain.c
--- 2/xen-2.4.16/common/domain.c
+++ b/xen-2.4.16/common/domain.c
@@@ -574,15 -568,11 +576,16 @@@ int setup_guestos(struct task_struct *p
  
      /* Add virtual network interfaces and point to them in startinfo. */
      while (params->num_vifs-- > 0) {
-         net_ring = create_net_vif(dom);
+         net_vif = create_net_vif(dom);
+         net_ring = net_vif->net_ring;
          if (!net_ring) panic("no network ring!\n");
      }
 -    virt_startinfo_address->net_rings = p->net_ring_base;
 +
 +/* XXX SMH: horrible hack to convert hypervisor VAs in SHIP to guest VAs  */
 +#define SHIP2GUEST(_x) (virt_shinfo_address | (((unsigned long)(_x)) & 0xFFF))
 +
 +    virt_startinfo_address->net_rings = 
 +      (net_ring_t *)SHIP2GUEST(p->net_ring_base); 
      virt_startinfo_address->num_net_rings = p->num_net_vifs;
  
      /* Add block io interface */

diff --cc xen-2.4.16/common/kernel.c
Simple merge

diff --cc xen-2.4.16/include/hypervisor-ifs/hypervisor-if.h
Simple merge